container: Remove gtk_container_maybe_start_idle_sizer()

Fold it into gtk_container_start_idle_sizer()

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 8beec75ca17dac19511a5e524855d7ac17c58de3..888d9d59d27c0b7bbde0ac01c808bbffb06fcd51 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1590,7 +1590,7 @@ gtk_container_idle_sizer (GdkFrameClock *clock,
 
   if (!gtk_container_needs_idle_sizer (container))
     {
-      _gtk_container_stop_idle_sizer (container);
+      gtk_container_stop_idle_sizer (container);
     }
   else
     {
@@ -1599,7 +1599,7 @@ gtk_container_idle_sizer (GdkFrameClock *clock,
     }
 }
 
-static void
+void
 gtk_container_start_idle_sizer (GtkContainer *container)
 {
   GtkContainerPrivate *priv = gtk_container_get_instance_private (container);
@@ -1608,6 +1608,9 @@ gtk_container_start_idle_sizer (GtkContainer *container)
   if (priv->resize_handler != 0)
     return;
 
+  if (!gtk_container_needs_idle_sizer (container))
+    return;
+
   clock = gtk_widget_get_frame_clock (GTK_WIDGET (container));
   if (clock == NULL)
     return;
@@ -1619,7 +1622,7 @@ gtk_container_start_idle_sizer (GtkContainer *container)
 }
 
 void
-_gtk_container_stop_idle_sizer (GtkContainer *container)
+gtk_container_stop_idle_sizer (GtkContainer *container)
 {
   GtkContainerPrivate *priv = gtk_container_get_instance_private (container);
 
@@ -1631,13 +1634,6 @@ _gtk_container_stop_idle_sizer (GtkContainer *container)
   priv->resize_handler = 0;
 }
 
-void
-_gtk_container_maybe_start_idle_sizer (GtkContainer *container)
-{
-  if (gtk_container_needs_idle_sizer (container))
-    gtk_container_start_idle_sizer (container);
-}
-
 void
 _gtk_container_queue_restyle (GtkContainer *container)
 {
@@ -1649,7 +1645,7 @@ _gtk_container_queue_restyle (GtkContainer *container)
     return;
 
   priv->restyle_pending = TRUE;
-  _gtk_container_maybe_start_idle_sizer (container);
+  gtk_container_start_idle_sizer (container);
 }
 
 void

diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h
index 2fa0e709089e83949dbaa2dadc80624a9003a1ec..74f24ddc90b9c613a9f780ce3a6effdb54f518f8 100644 (file)
--- a/gtk/gtkcontainerprivate.h
+++ b/gtk/gtkcontainerprivate.h
@@ -27,8 +27,8 @@ G_BEGIN_DECLS
 
 
 void     _gtk_container_queue_restyle          (GtkContainer *container);
-void      _gtk_container_stop_idle_sizer        (GtkContainer *container);
-void      _gtk_container_maybe_start_idle_sizer (GtkContainer *container);
+void      gtk_container_stop_idle_sizer         (GtkContainer     *container);
+void      gtk_container_start_idle_sizer        (GtkContainer     *container);
 void      gtk_container_set_focus_child         (GtkContainer     *container,
                                                  GtkWidget        *child);
 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ab309b158acf4bcf3fc48d261eeacd6801082687..9d8d1ce60bdaeb3f5496ce6a78edec1723e10ce7 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3695,7 +3695,7 @@ gtk_widget_connect_frame_clock (GtkWidget     *widget,
   GtkWidgetPrivate *priv = widget->priv;
 
   if (GTK_IS_CONTAINER (widget))
-    _gtk_container_maybe_start_idle_sizer (GTK_CONTAINER (widget));
+    gtk_container_start_idle_sizer (GTK_CONTAINER (widget));
 
   if (priv->tick_callbacks != NULL && !priv->clock_tick_id)
     {
@@ -3718,7 +3718,7 @@ gtk_widget_disconnect_frame_clock (GtkWidget     *widget,
   GtkWidgetPrivate *priv = widget->priv;
 
   if (GTK_IS_CONTAINER (widget))
-    _gtk_container_stop_idle_sizer (GTK_CONTAINER (widget));
+    gtk_container_stop_idle_sizer (GTK_CONTAINER (widget));
 
   gtk_css_node_invalidate_frame_clock (priv->cssnode, FALSE);
 
@@ -11930,7 +11930,7 @@ gtk_widget_set_alloc_needed (GtkWidget *widget)
 
       if (_gtk_widget_is_toplevel (widget))
         {
-          _gtk_container_maybe_start_idle_sizer (GTK_CONTAINER (widget));
+          gtk_container_start_idle_sizer (GTK_CONTAINER (widget));
           break;
         }